From: Umang Jain <umang@endlessm.com>
Date: Wed, 18 Jul 2018 05:33:29 +0000 (+0530)
Subject: Release 2018.7
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~21^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=21318bbc1f6692fbced6d79f9fe3c3a9f9ab094d;p=ostree.git

Release 2018.7

Request via flatpak: mainly to port min-free-space-size

Closes: #1683
Approved by: cgwalters
---

diff --git a/configure.ac b/configure.ac
index add72b8f..4484e06a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ m4_define([year_version], [2018])
 m4_define([release_version], [7])
 m4_define([package_version], [year_version.release_version])
 AC_INIT([libostree], [package_version], [walters@verbum.org])
-is_release_build=no
+is_release_build=yes
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([buildutil])
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym
index 49aa2b97..a4040ba6 100644
--- a/src/libostree/libostree-devel.sym
+++ b/src/libostree/libostree-devel.sym
@@ -18,12 +18,6 @@
 ***/
 
 /* Add new symbols here.  Release commits should copy this section into -released.sym. */
-LIBOSTREE_2018.7 {
-global:
-    ostree_mutable_tree_fill_empty_from_dirtree;
-    ostree_mutable_tree_new_from_checksum;
-    ostree_mutable_tree_check_error;
-} LIBOSTREE_2018.6;
 
 /* Stub section for the stable release *after* this development one; don't
  * edit this other than to update the last number.  This is just a copy/paste
diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym
index c3c1d502..1e17e581 100644
--- a/src/libostree/libostree-released.sym
+++ b/src/libostree/libostree-released.sym
@@ -527,6 +527,13 @@ global:
   ostree_validate_collection_id;
 } LIBOSTREE_2018.5;
 
+LIBOSTREE_2018.7 {
+global:
+    ostree_mutable_tree_fill_empty_from_dirtree;
+    ostree_mutable_tree_new_from_checksum;
+    ostree_mutable_tree_check_error;
+} LIBOSTREE_2018.6;
+
 /* NOTE: Only add more content here in release commits!  See the
  * comments at the top of this file.
  */
diff --git a/tests/test-symbols.sh b/tests/test-symbols.sh
index 57e5f6e1..faf58dcf 100755
--- a/tests/test-symbols.sh
+++ b/tests/test-symbols.sh
@@ -54,7 +54,7 @@ echo 'ok documented symbols'
 
 # ONLY update this checksum in release commits!
 cat > released-sha256.txt <<EOF
-0d9b42d7e6694a6875962e253c0ffc61f8363dfdfb78f41b843223708cae60d5  ${released_syms}
+611278b6081cbd34e365f3a7988e0c981644a828230973d7675a1a31ef09a0e3  ${released_syms}
 EOF
 sha256sum -c released-sha256.txt